Skip to content

Conversation

@greged93
Copy link

@greged93 greged93 commented Oct 7, 2025

No big changes in this upstream merge.

fgimenez and others added 30 commits September 15, 2025 09:23
…ashblocks (paradigmxyz#18374)

Co-authored-by: Nathaniel Bajo <[email protected]>
Co-authored-by: Matthias Seitz <[email protected]>
Co-authored-by: Arsenii Kulikov <[email protected]>
Cargo.toml Outdated
Comment on lines 489 to 500
revm = { git = "https://github.com/scroll-tech/revm", default-features = false, features = ["enable_eip7702", "enable_eip7623"], branch = "feat/v87" }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-database = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-state = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-primitives = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-inspector = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-context = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
op-revm = { git = "https://github.com/scroll-tech/revm", default-features = false , branch = "feat/v87"}
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false, branch = "feat/v87" }
Copy link
Author

@greged93 greged93 Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: revert back to default branch once other PRs are merged.

Comment on lines 164 to 178
@@ -174,6 +175,7 @@ where
}

// apply gas oracle predeploy upgrade at Feynman transition block.
#[allow(clippy::collapsible_if)]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it looks more readable without the collapse, but let me know what you think

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally think it's a good idea to respect clippys standards but I'm not strongly opinionated.

@@ -62,6 +62,7 @@ impl<
}

// verify the receipts logs bloom and root
#[allow(clippy::collapsible_if)]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@codspeed-hq
Copy link

codspeed-hq bot commented Oct 7, 2025

CodSpeed Performance Report

Merging #346 will not alter performance

Comparing chore-merge-upstream-e9598ba5a (2d9fb76) with scroll (61d5c38)

Summary

✅ 77 untouched

Signed-off-by: Gregory Edison <[email protected]>
@greged93 greged93 force-pushed the chore-merge-upstream-e9598ba5a branch from 220c772 to 348a029 Compare October 7, 2025 11:43
@greged93
Copy link
Author

greged93 commented Oct 8, 2025

compact-codec is expected to fail, base does not have compaction on EthereumReceipt. Read and writes work locally.

Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
@greged93 greged93 merged commit 32019bc into scroll Oct 9, 2025
42 of 45 checks passed
@greged93 greged93 deleted the chore-merge-upstream-e9598ba5a branch October 9, 2025 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.